Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 2 Sep 2010 15:51:53 +0000 (16:51 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 2 Sep 2010 15:51:53 +0000 (16:51 +0100)

Trivial merge